Merge version 8.4.16-1+rpi1 and 8.4.20-1 to produce 8.4.20-1+rpi1

diff --cc debian/changelog
index 546ea5ec9b2af2ccb0b8fda19ee2018e230cedca,d76e32fb28375e2cb85c09f55722b81d506aa0d7..936282b35623da7bdcf1c7c8cafb9b89de80b2c9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,37 +1,44 @@@
- php8.4 (8.4.16-1+rpi1) forky-staging; urgency=medium
++php8.4 (8.4.20-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 8.4.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 17 Oct 2025 01:23:38 +0000]
 +  * Fix fpu setting for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Feb 2026 17:17:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Apr 2026 19:54:31 +0000
++
+ php8.4 (8.4.20-1) unstable; urgency=medium
+ 
+   * New upstream version 8.4.20
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 11 Apr 2026 09:08:00 +0200
+ 
+ php8.4 (8.4.19-1) unstable; urgency=medium
+ 
+   * New upstream version 8.4.19
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Mon, 30 Mar 2026 21:23:42 +0200
+ 
+ php8.4 (8.4.18-2) unstable; urgency=medium
+ 
+   * Disable debugging output in secure DNS telemetry
+   * The secure DNS telemetry is disabled at the compile-time
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Fri, 13 Feb 2026 16:47:25 +0100
+ 
+ php8.4 (8.4.18-1) unstable; urgency=medium
+ 
+   * New upstream version 8.4.18
+   * Make the apache2 configuration ReDoS resistant
+   * Add a minimal privacy-preserving secure DNS telemetry to check current
+     version if there are security updates available
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 12 Feb 2026 21:44:07 +0100
+ 
+ php8.4 (8.4.17-1) unstable; urgency=medium
+ 
+   * Modernize lintian tags
+   * New upstream version 8.4.17
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sun, 18 Jan 2026 15:17:11 +0100
  
  php8.4 (8.4.16-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge